Add /usr/share/info/emacs-22 to Info-default-directory-list.

diff --git a/debian/changelog b/debian/changelog
index 447ef9d22961478b6987a7d901cd9a78dec47a53..b7833f8155b785ceceeb268d939155dbf8520534 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,10 @@ emacs22 (22.1+1-1) unstable; urgency=low
 
   * New release restores python mode. (closes: #430553) [rlb]
 
- -- Rob Browning <rlb@defaultvalue.org>  Wed, 04 Jul 2007 23:51:14 -0700
+  * Add /usr/share/info/emacs-22 to Info-default-directory-list before
+    /usr/share/info. (closes: #425924, #429526) [rlb]
+
+ -- Rob Browning <rlb@defaultvalue.org>  Fri, 06 Jul 2007 20:08:59 -0700
 
 emacs22 (22.0.99+1-1) experimental; urgency=low
 

diff --git a/debian/patches/debian-site-init-el.diff b/debian/patches/debian-site-init-el.diff
new file mode 100644 (file)
index 0000000..1ca84d1
--- /dev/null
+++ b/debian/patches/debian-site-init-el.diff
@@ -0,0 +1,23 @@
+* Emacs will prefer /usr/share/info/emacs22 over /usr/share/info.
+  Patch: debian-site-init-el.diff
+
+  The value of Info-default-directory-list has been augmented via
+  site-init.el to include /usr/share/info/emacs-22 before
+  /usr/share/info.
+    
+Index: sid/lisp/site-init.el
+===================================================================
+--- /dev/null
++++ sid/lisp/site-init.el
+@@ -0,0 +1,11 @@
++
++;; Add the flavor specific directory for Debian.
++(setq Info-default-directory-list
++      (let ((result nil)
++            (found-match nil))
++        (dolist (elt Info-default-directory-list (nreverse result))
++          (if (and (not found-match) (equal elt "/usr/share/info/"))
++              (progn
++                (push "/usr/share/info/emacs-22" result)
++                (setq found-match t)))
++          (push elt result))))